Merge pull request #1906 from ldir-EDB0/typofix