Fixed issues with wrong object being called.