listing expirey and renewal date ISSUE!!!

So I have created a listing on my website, I have saved that listing, but have not yet paid for that listing.

The expiry date shown for the listing is the date I created the listing. At this point the listing is set to pending and is not live until payment is made.

I went back to pay for my listing after 3 days, after a successful transaction the listing was live, however the expiry date for the listing was not updated to the date of payment/live listing, but remained as the initial date I created the listing.

I have also noticed that the expiry date for listings pending admin review are not updated to the date they are published.

Surely all listing expiry dates should be relevant to the date they are published and live on the site.