Fix type and remove annotation that was useless
Merge remote-tracking branch 'origin/master'