diff --git a/datastore/bolt/build.go b/datastore/bolt/build.go
index eb3b49e0a..786294742 100644
--- a/datastore/bolt/build.go
+++ b/datastore/bolt/build.go
@@ -203,8 +203,12 @@ func (db *DB) SetBuildTask(repo string, build int, task *common.Task) error {
 		if err != nil {
 			return err
 		}
+		if task.Number > len(build_.Tasks) {
+			return ErrKeyNotFound
+		}
 		build_.Updated = time.Now().UTC().Unix()
-		build_.Tasks[task.Number] = task // TODO check index to prevent nil pointer / panic
+		//assuming task number is 1-based.
+		build_.Tasks[task.Number-1] = task // TODO check index to prevent nil pointer / panic
 		return update(t, bucketBuild, key, build_)
 	})
 }
diff --git a/datastore/bolt/build_test.go b/datastore/bolt/build_test.go
index 2046ed0a6..35c6a6cb1 100644
--- a/datastore/bolt/build_test.go
+++ b/datastore/bolt/build_test.go
@@ -98,21 +98,19 @@ func TestBuild(t *testing.T) {
 			g.Assert(err_).Equal(nil)
 		})
 
-		/*
-			g.It("Should set build task: SetBuildTask()", func() {
-				err := db.SetRepoNotExists(&common.User{Login: testUser}, &common.Repo{FullName: testRepo})
-				g.Assert(err).Equal(nil)
+		g.It("Should set build task: SetBuildTask()", func() {
+			err := db.SetRepoNotExists(&common.User{Login: testUser}, &common.Repo{FullName: testRepo})
+			g.Assert(err).Equal(nil)
 
-				db.SetBuild(repo, &common.Build{State: "error"})
-				db.SetBuild(repo, &common.Build{State: "pending"})
-				db.SetBuild(repo, &common.Build{State: "success"})
-				err_ := db.SetBuildTask(repo, 1, &common.Task{Number: 1})
-				g.Assert(err_).Equal(nil)
-				err_ = db.SetBuildTask(repo, 1, &common.Task{Number: 2})
-				g.Assert(err_).Equal(nil)
-				err_ = db.SetBuildTask(repo, 2, &common.Task{Number: 1})
-				g.Assert(err_).Equal(nil)
-			})
-		*/
+			db.SetBuild(repo, &common.Build{State: "error"})
+			db.SetBuild(repo, &common.Build{State: "pending"})
+			db.SetBuild(repo, &common.Build{State: "success"})
+			err_ := db.SetBuildTask(repo, 1, &common.Task{Number: 1})
+			g.Assert(err_).Equal(nil)
+			//err_ = db.SetBuildTask(repo, 1, &common.Task{Number: 2})
+			//g.Assert(err_).Equal(nil)
+			//err_ = db.SetBuildTask(repo, 2, &common.Task{Number: 1})
+			//g.Assert(err_).Equal(nil)
+		})
 	})
 }
diff --git a/server/builds.go b/server/builds.go
index 8535737a1..0586f50a5 100644
--- a/server/builds.go
+++ b/server/builds.go
@@ -89,7 +89,9 @@ func PostBuildStatus(c *gin.Context) {
 		c.AbortWithStatus(400)
 		return
 	}
-	if err := store.SetStatus(repo.Name, num, in); err != nil {
+
+	//if err := store.SetStatus(repo.Name, num, in); err != nil {
+	if err := store.SetBuildStatus(repo.Name, num, in); err != nil {
 		c.Fail(400, err)
 	} else {
 		c.JSON(201, in)