Fix for end of string