Attempt to fix the ahi waiting