Actually fix #8