Actually fix #61