Issue #92 work around