How about replacing this mechanism with wait for a status?