fix RT 93192 and # 93539