Fixes Bug 1054209