Overflow second fix