Fixes bug 1085660