IS & QS g2g. Fix MS & HS