Not tested, but should close #70, again