Fix returned object