Fixing mandatory after KUL XML change