Curator 110

Fix for CURATOR-110