Further character cutoff bugfix