fix type
Merge branch 'feature/fixtype' into dev