argh, still wasn't quite right
0.6.3