Workaround based on 2 uses for this method with each handling different Object (TODO added to gain attention of need for proper fix)