Fixed incorrect parsing of some strings