Fix the api :)