Fix handler bug