fix to unparse method