I hope you don't mind I take this issue, I was working on it by change to help a user on the forums.