Fixed interaction on address form yet again