* Fix for objects as parameters bug