patch for #9/MAGE-6982