Fixed handlers option comments