Fix warning about types
Merge branch 'fix-types-warning'