Merge branch 'fix-typeerror'