Fix when/then/done