Fix for bugzid 3443