diff --git a/src/main/scala/gitbucket/core/service/AccessTokenService.scala b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
index e751cbc..7ce535f 100644
--- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala
+++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
@@ -30,7 +30,8 @@
     do {
       token = makeAccessTokenString
       hash = tokenToHash(token)
-    } while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+    //} while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+    } while (Query(AccessTokens.filter(_.tokenHash === hash.bind).exists).first)
     val newToken = AccessToken(
         userName = userName,
         note = note,
diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala
index 6fad392..271b946 100644
--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -111,7 +111,8 @@
    */
   def updatePullRequests(owner: String, repository: String, branch: String)(implicit s: Session): Unit =
     getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
-      if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
+      if(Query(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists).first){
+      //if(Repositories.filter(_.byRepository(pullreq.userName, pullreq.repositoryName)).exists.run){
         val (commitIdTo, commitIdFrom) = JGitUtil.updatePullRequest(
           pullreq.userName, pullreq.repositoryName, pullreq.branch, pullreq.issueId,
           pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
diff --git a/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
index 5be477c..0238fee 100644
--- a/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
+++ b/src/test/scala/gitbucket/core/service/IssuesServiceSpec.scala
@@ -6,43 +6,42 @@
 
 
 class IssuesServiceSpec extends FunSuite with ServiceSpecBase {
-  test("getCommitStatues") { withTestDB { implicit session =>
-    val user1 = generateNewUserWithDBRepository("user1","repo1")
+  test("getCommitStatues") {
+    withTestDB { implicit session =>
+      val user1 = generateNewUserWithDBRepository("user1","repo1")
 
-    def getCommitStatues = List(
-      dummyService.getCommitStatues("user1","repo1",1),
-      dummyService.getCommitStatues("user1","repo1",2)
-    )
+      def getCommitStatues(issueId: Int) = dummyService.getCommitStatues("user1","repo1",issueId)
 
-    assert(getCommitStatues == Map.empty)
+      assert(getCommitStatues(1) == None)
 
-    val now = new java.util.Date()
-    val issueId = generateNewIssue("user1","repo1")
-    assert(issueId == 1)
+      val now = new java.util.Date()
+      val issueId = generateNewIssue("user1","repo1")
+      assert(issueId == 1)
 
-    assert(getCommitStatues == Map.empty)
+      assert(getCommitStatues(1) == None)
 
-    val cs = dummyService.createCommitStatus("user1","repo1","shasha", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
+      val cs = dummyService.createCommitStatus("user1","repo1","shasha", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
 
-    assert(getCommitStatues == Map.empty)
+      assert(getCommitStatues(1) == None)
 
-    val (is2, pr2) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature1")
-    assert(pr2.issueId == 2)
+      val (is2, pr2) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature1")
+      assert(pr2.issueId == 2)
 
-    // if there are no statuses, state is none
-    assert(getCommitStatues == Map.empty)
+      // if there are no statuses, state is none
+      assert(getCommitStatues(2) == None)
 
-    // if there is a status, state is that
-    val cs2 = dummyService.createCommitStatus("user1","repo1","feature1", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
-    assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(1,1,Some("default"),Some(CommitState.SUCCESS),Some("http://exmple.com/ci"),Some("exampleService"))))
+      // if there is a status, state is that
+      val cs2 = dummyService.createCommitStatus("user1","repo1","feature1", "default", CommitState.SUCCESS, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
+      assert(getCommitStatues(2) == Some(CommitStatusInfo(1,1,Some("default"),Some(CommitState.SUCCESS),Some("http://exmple.com/ci"),Some("exampleService"))))
 
-    // if there are two statuses, state is none
-    val cs3 = dummyService.createCommitStatus("user1","repo1","feature1", "pend", CommitState.PENDING, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
-    assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(2,1,None,None,None,None)))
+      // if there are two statuses, state is none
+      val cs3 = dummyService.createCommitStatus("user1","repo1","feature1", "pend", CommitState.PENDING, Some("http://exmple.com/ci"), Some("exampleService"), now, user1)
+      assert(getCommitStatues(2) == Some(CommitStatusInfo(2,1,None,None,None,None)))
 
-    // get only statuses in query issues
-    val (is3, pr3) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature3")
-    val cs4 = dummyService.createCommitStatus("user1","repo1","feature3", "none", CommitState.PENDING, None, None, now, user1)
-    assert(getCommitStatues == Map(("user1","repo1",2) -> CommitStatusInfo(2,1,None,None,None,None)))
-  } }
+      // get only statuses in query issues
+      val (is3, pr3) = generateNewPullRequest("user1/repo1/master","user1/repo1/feature3")
+      val cs4 = dummyService.createCommitStatus("user1","repo1","feature3", "none", CommitState.PENDING, None, None, now, user1)
+      assert(getCommitStatues(2) == Some(CommitStatusInfo(2,1,None,None,None,None)))
+    }
+  }
 }
\ No newline at end of file