MSH special cases fix