Added fi_wait