Fixed some overflow