Slight mapping improvement.