Fixing ESBJAVA-3332