Fixing tokenization bug causing single quotes to not be removed