Actually fix #21 (hopefully).