[FIX] Fix mistypes that cause exceptions
Merge pull request #2028 from vhpoet/develop

[FIX] Fix mistypes that cause exceptions