it should works, but more tests are needed

Same as 55bc92d2
(written by Carlo), but in such a way that it results as a git mv