Possibly fix ghost unit issue