Made address argument stricter