solve problems on add new Unit