Fixed oferflow bug