Fixes bug 951022