Fix the matcher movement