Fix handler to store information