 Alternatively, we can work on the #17 issue first so that this gets managed automatically.