Adding handled = true