Finally fix #61 with a hack.