Third one today...

Fixed an issue with last merge. Let's see if I can get this one right...