issue #19314: Fix bugs
Merge pull request #35 from jrogelstad/master

issue #19314: Fix bugs.