Issue #39: Workaround