Bug #12065: This should fix things