Adding fix for objects in different namespace from repository.