Fixed compile (alas, no more goto)