Caught a bug in ES serialization
Initial version