Change to string comparison