Probably done with #196 (untested)