fix overflow stuff