Changing logic for CROSSDATA-240