Made command's state resolution even more tricky...