Quick fix for the new API path, it might be a good idea to make a better fix