tweaked handler, still dysfunctional