initial fix for Bug #1072739