fixing stale event binding