fix for bug 895730 and 895733