fixed command checks