Actually fix #206, maybe.