fix for BZ 1017231