Bugzilla issue fix for 822959