Fix in the right place