Issue #89 workaround