AE: workaround the deadlock mess (constant waiting)