workaround for SI-5397