S2/S2 stable fix