diff --git a/upload.go b/upload.go
index 10a0b82..46343e7 100755
--- a/upload.go
+++ b/upload.go
@@ -64,7 +64,7 @@ func uploadPTTodo(config Config, transaction *Transaction) error {
 	} else if len(b) == 0 {
 		b = []byte("todo:\n")
 	}
-	f, err := ioutil.TempFile(os.TempDir(), path.Base(config.TodoAddr))
+	f, err := ioutil.TempFile(path.Dir(config.TodoAddr), path.Base("."+config.TodoAddr))
 	if err != nil {
 		return err
 	}
@@ -84,9 +84,11 @@ func uploadPTTodo(config Config, transaction *Transaction) error {
 	}
 	f.Close()
 	var v interface{}
-	if b, err := ioutil.ReadFile(f.Name()); err != nil {
+	b, err = ioutil.ReadFile(f.Name())
+	if err != nil {
 		return err
-	} else if err := yaml.Unmarshal(b, &v); err != nil {
+	}
+	if err := yaml.Unmarshal(b, &v); err != nil {
 		return err
 	}
 	return os.Rename(f.Name(), config.TodoAddr)