CROSSDATA-200 bug fix