Fixed bug in string partial match