I'll take a look at this, not too difficult obviously but takes a minute to bubble through all the affected code.