Fixed merge mistake.