Preposed fix for api