Issue #64 Workaround