Fixing Bug #10293