Ipn fix

Yeah, probably so. There was a lot of refactoring, and I didn't want to go too heavy with this. That's the reason for the TODO - though the comment is wrong.