Fix for ModelMan.