Fixing ESBJAVA-3256