Issue CROSSDATA-199 fixed