Fix overflowing problem