Fix for defect CID 51682
Fix for defect CID 51684