Fix by Sandro to avoid temporary file collisions