Merge "Fix double comparison"