Fixed onCommand.