Add a fix from aorlinsk to fix an issue with the order in options passed to tar