fix type wasn't called
Merge branch 'work'