command fix
Serialization and command fix