Removed cast to short