fixing ESBJAVA-3303