Fixed the circularity issue with unroll after talking with Mitch.