Fixed disappearing unit issue