major fix for API