fixed #1 - incorrectly handling some strings