fixed string comparison issues