Disable address comparision for now