Fixing Bug #10308