Oops, not quite all done properly (#339).