fixing L1 ESBJAVA-3148