manual solution for #42. (actually remapping was possible long time ago)