Duration of classifieds is not working properly

When creating an ad the expiration date is set to 2 months ahead but when editing the ad afterwards the duration increases with additional 2 months above the original 2 months.

I read an older thread about the same problem. The thread was 1 year old, I hope you have found the solution on this!

Do you have a quick fix for this issue?