fixed some oob data errors