Better fix for #1201 (case-insensitive)