This fixes #874 once merged. It will require a couple of tests by other users to ensure that MPOS is not affected (via hard-linked URLs for example).