That does appear to fix it. It's definately a work-around. I believe there's a mutex dead-locking issues at bottom which would need to be addressed.

I've accepted this as a fix for now.

Thanks!