Fixing ESBJAVA-3079