*Fixed objects passed to functions

*Fixed objects passed to functions