Command fix attempt #2