Fix for BZ 1132292