Fixing ESBJAVA-2923