Should have been done with #105