manual API to fix broken API