Add workaround for problem where get_object_by_guid returns the wrong class