Fix handler state