overflow bugfix