ace8ad861d
Only fixing crash, proper handling (a.k.a remapping) of all possible cases here, for all possible data layers, is rather involved...