Additional fix to uint behaviour.