possible overflow bug fix