Add workaround for SI-1336