Added mate checking to correct class.