apply fix to all Objects
Merge pull request #147 from NotBobTheBuilder/issue78

apply fix for #78 to all Objects