Fix handler error