Fixing ESBJAVA-3280