Merge "Fix compare check for if statement"