fix incremental typing