Broke some things to fix #4