and type error fixed