Fixes waiting management