Fix it both places