Fixing if/when