Fixed: object are now properly passed