Fix code to allow shorter valid addresses.