Comments added and e.Handled = true moved to very end.