hack to fix Issue #41