Fix command check