Fix for suffix case insensitivity