Fix using Domain & Port as fallbacks - thanks @johnny-john