Merge "Fix string comparison"