fixing final bugsa