S2M bug fix for D8 dependencies