@iNecas, Per our discussion, I'd like to tackle this one as a separate PR, since it is also an issue with the current implementation.  I'll create an issue in redmine for it.