Merge branch 'type-fix'