Actually fix #138