Fix ua code on return