diff --git a/src/main/java/io/github/jpmorganchase/fusion/oauth/model/BearerToken.java b/src/main/java/io/github/jpmorganchase/fusion/oauth/model/BearerToken.java
index bf438729..fa0f9ce7 100644
--- a/src/main/java/io/github/jpmorganchase/fusion/oauth/model/BearerToken.java
+++ b/src/main/java/io/github/jpmorganchase/fusion/oauth/model/BearerToken.java
@@ -27,7 +27,7 @@ public static BearerToken of(String token) {
 
     public static BearerToken of(OAuthServerResponse oAuthServerResponse, long currentTimeInMillis) {
         return BearerToken.of(
-                oAuthServerResponse.getAccessToken(), oAuthServerResponse.getExpiresIn(), currentTimeInMillis);
+                oAuthServerResponse.getAccessToken(), currentTimeInMillis, oAuthServerResponse.getExpiresIn());
     }
 
     public static BearerToken of(String token, long currentTimeInMillis, long expiresIn) {
diff --git a/src/test/java/io/github/jpmorganchase/fusion/oauth/model/BearerTokenTest.java b/src/test/java/io/github/jpmorganchase/fusion/oauth/model/BearerTokenTest.java
index f9cd3f5e..e8b99bde 100644
--- a/src/test/java/io/github/jpmorganchase/fusion/oauth/model/BearerTokenTest.java
+++ b/src/test/java/io/github/jpmorganchase/fusion/oauth/model/BearerTokenTest.java
@@ -6,6 +6,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.github.jpmorganchase.fusion.oauth.retriever.OAuthServerResponse;
+
 class BearerTokenTest {
 
     @Test
@@ -41,4 +43,25 @@ public void testHasTokenExpiredWhenCanExpire() {
         assertTrue(bearerToken.hasTokenExpired(expiry + 1));
         assertFalse(bearerToken.hasTokenExpired(expiry - 1));
     }
+
+    @Test
+    public void testHasTokenExpiredWhenCanExpireFromResponse() {
+        String token = "my-token";
+        long currentTimeInMillis = 1625666400000L;
+        int expiresIn = 3600;
+
+        OAuthServerResponse oAuthServerResponse =
+
+                OAuthServerResponse.builder()
+                        .accessToken(token)
+                        .expiresIn(expiresIn)
+                        .build();
+
+        BearerToken bearerToken = BearerToken.of(oAuthServerResponse, currentTimeInMillis);
+
+        long expiry = bearerToken.getExpiry();
+
+        assertTrue(bearerToken.hasTokenExpired(expiry + 1));
+        assertFalse(bearerToken.hasTokenExpired(expiry - 1));
+    }
 }