1869: Fix case insensivity issue