fixed ESBJAVA-3006