Fixed handlers initialization