fix gh-434 and tests
Merge remote-tracking branch 'origin/fix-gh-434-v3'