Fix flow API