Fix for bugzid 3833