unrolling fix