Fix for address validation