Actually fix #40