Invoice entry; selecting Other Party not always defaulting delivery address.

During invoice entry if you select an other party with a delivery address the delivery address will default.

However if you then move off the other party field then go back to it and change the code to an other party that does not have a delivery address the postal address will be used. After this using the up and down arrows to move through other parties always default to the postal address regardless if there is a delivery address or not.