Avoid some accidental manouver type matches