Fixing Bug #10309 (previous change was wrong)