Fix false invalid commands