short-term hack to fix #1607