@Colin:
Correct that does fix this (in a better way than my original patch). Here is a patch for your changes. Same naming confusion as I mentioned above.
@Colin:
Correct that does fix this (in a better way than my original patch). Here is a patch for your changes. Same naming confusion as I mentioned above.