Commit IPv6 fix, with majoring factoring out. Thank you Feyd!