Added check for command operator