Command checker fix