If this is still an issue that needs addressing, I'm happy to look at it as well.

Only just saw this now.