WIP: overflows fixing