Oops, use the right types