Issue #53: Workaround