fix unroll map