CROSSDATA-242 should be solved now