Fix for object passing