Hack to fix #85