Added casting to short as well.
Added casting to short as well.

fvpolpeta/devide,zhangfangyan/devide,chrisidefix/devide,fvpolpeta/devide,chrisidefix/devide,ivoflipse/devide,nagyistoce/devide,zhangfangyan/devide,ivoflipse/devide,nagyistoce/devide