Fixed setup handler