Fixes Bug 1042133 regression