Merge pull request #1949 from lewurm/fixtype