fix wait cursor flow