Merge "Fix reversed logic"