annoying conditional fixed