first draft of fix for CURATOR-150