Fixed if, need more coffee