v1.6 Bug in Guest Checkout when adding separate invoice address

[ukbaz]

Hi I am using Prestashop version 1.6.1.23 5 step checkout with guest checkout enabled.

Have now just noticed a bug and wondered if anyone had a fix for it.

When checking out as guest customer and entering a company name in delivery address, if customer click the checkbox to use separate delivery and invoice addresses and fills in the invoice address (without a company name- eg. home address) then when saving addresses to continue checkout on the next page order addresses the company name from the delivery address also appears in the invoice address as well - despite nothing being entered there. This causes problems as what is a home address appears as a company!

Have attached images to demonstrate what I mean. 

I've spent ages trying to find out where / why this happens.... Can anyone help??

 

Thanks

Baz