fix Command.g