Check for the specific modifier instead of last char in string

Check for the specific modifier instead of last char in string #3495