RIPD 427

The first change is just a cleaning - the second one has my possible fix.  

I wouldn't say I'm secure that this is correct - further discussion is solicited.