Fix for bugid 97701