Continued mate finding fix