Fix problem with CROSSDATA-303