Workaround for api failure