Type path fix.
Merge pull request #3602 from Zuhayr/dev

Type path fix.