Workaround for Issue #2. Please test.