fixing coditionals