Fixing Bug #10309 (improved)