Fix the logic fubar