cheap hack to fix #283