Fix in preserving existing type annotations