map_kernel fixed