if/when fix

previous paragraph needs correction as well, unsure how to pursue this
Merge pull request #351 from tp/patch-1

if/when fix