Fix terrible  management