Really fix #41, well, workaround anyway