Only fix when asked for it