fixing #552 overflows properly