Fix handler startup