Fix in a different way