work on fixing bug 939783