Closes #24. This is a Bonfire 0.7 bug, but added a local workaround.