Always set type correctly