Issue #186 tentative fix