Hot fix for api