Change way of running handler