There was a bug in my previous bug fix but not any more!