Fixed unit bug