fix
Merge pull request #1719 from conejoninja/ts

fix