was removing wrong handler for once