fix for BZ 1041338