Fixed the loading of units