Fix for Issue Item Number: 10098