correct mismatched command handlers