Fix to use myself as tap