Change request: Another tmpfile fix