Use proper types, will fix in collar..