Work around MSC16 bug