Fixed for returned objects