Fix MSC16 confusion