#346 - little corrections to deserialization mechanism