Favor types over the previous changes