fixed some broken overflowing