back to wait_state hack