Naive x0 fix