Hack to fix #805