Hi Bruce, 

Thank you for the feedback. We will later see if anything can be done at this point. 

I think that this can be solved by the following patch, please check.