I will have a look at this issue today, as I think I have a solution for it. This also should be sorted before v4 release.