fixed unmarshaling bug