Possible fix for bugzilla 443609