change order so that retyping is correctly identified sa a function and not a type