fix bad merge, gh-8