Fixed issue with data mapping that creates multiple enrol instances