Fixed broken API