Issue #80 workaround