hack to fix #53