Fixing ESBJAVA-3025