Fixing CircularBuffer