Fix for Object has no method 'map'