Correctly fix Bug #13352