I'll look at #76 and close this after.