Making this work a little better on a new pairhost