Fixing issue RAMPART-273