experiment with loop unswitching
small fix for treatment of initial conditions