Workaround Issue #72