Fix badmatch estop