Fixed msopck issues caused by refactoring