Fixing ESBJAVA-3136.