Fix for BZ 1079894