OneFichier: Fixed #836 - remains the rewrite work