Fixed a error when chceking for disguise conflicts