Created attachment 106097 [details] Fix v4 Here is an updated patch that addresses Michel's comments.