Issue #3275: temporary workaround