if/when fix

previous paragraph needs correction as well, unsure how to pursue this