Fixed completely broken API