fix for non-standard ports
Merge branch 'fix-for-non-standard-ports'