Overflow fixed fully