fix for BZ 1036685