Proposed fix for bugzilla issue