* fix "waiting for" feature