Workaround for Issue #5