Aaron Whiteside I prepared a PR with a fix and a test, we should merge it soon.

I'm planning to release a 6.0.9.Final on next Tuesday so you shouldn't have to wait for too long.

Thanks for the report!