CROSSDATA-299 solved