Fix most courageous and most infectious logic