Address MSC16 warning