Overflow bug fixed