Updated remapper (fixes #268).