Fixed handlers dependency