Fix enum type conversion warning
Merge branch 'fix-warning'