DoubleCommand serialization fix by Sergey