Fixing ESBJAVA-3006