fixing up wiretap