Fixed command data bug