Fixes Bug 964335