refs #696, fix issue and add test
Merge branch 'bugfixes/tokumx-1.3'