merged sastes fix