diff --git a/pkg/storage/inmemory/inmemory.go b/pkg/storage/inmemory/inmemory.go
index bdb146f8a..0c26bc680 100644
--- a/pkg/storage/inmemory/inmemory.go
+++ b/pkg/storage/inmemory/inmemory.go
@@ -52,10 +52,10 @@ func (storage *Storage) StoreObject(bucket string, key string, data io.Reader) e
 		size := bytesBuffer.Len()
 		etag := fmt.Sprintf("%x", sha256.Sum256(bytesBuffer.Bytes()))
 		newObject.metadata = mstorage.ObjectMetadata{
-			Key:        key,
-			SecCreated: time.Now().Unix(),
-			Size:       size,
-			ETag:       etag,
+			Key:     key,
+			Created: time.Now(),
+			Size:    size,
+			ETag:    etag,
 		}
 		newObject.data = bytesBuffer.Bytes()
 	}
@@ -74,7 +74,7 @@ func (storage *Storage) StoreBucket(bucketName string) error {
 	newBucket := storedBucket{}
 	newBucket.metadata = mstorage.BucketMetadata{
 		Name:    bucketName,
-		Created: time.Now().Unix(),
+		Created: time.Now(),
 	}
 	log.Println(bucketName)
 	storage.bucketdata[bucketName] = newBucket
diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go
index 9d56c2c19..a80e91b66 100644
--- a/pkg/storage/storage.go
+++ b/pkg/storage/storage.go
@@ -19,6 +19,7 @@ package storage
 import (
 	"io"
 	"regexp"
+	"time"
 )
 
 type Storage interface {
@@ -35,14 +36,14 @@ type Storage interface {
 
 type BucketMetadata struct {
 	Name    string
-	Created int64
+	Created time.Time
 }
 
 type ObjectMetadata struct {
-	Key        string
-	SecCreated int64
-	Size       int
-	ETag       string
+	Key     string
+	Created time.Time
+	Size    int
+	ETag    string
 }
 
 func IsValidBucket(bucket string) bool {
diff --git a/pkg/webapi/minioapi/minioapi.go b/pkg/webapi/minioapi/minioapi.go
index ee8cc2882..396a5ab8d 100644
--- a/pkg/webapi/minioapi/minioapi.go
+++ b/pkg/webapi/minioapi/minioapi.go
@@ -56,8 +56,7 @@ func (server *minioApi) getObjectHandler(w http.ResponseWriter, req *http.Reques
 	object := vars["object"]
 
 	metadata := server.storage.GetObjectMetadata(bucket, object)
-	lastModifiedTime := time.Unix(metadata.SecCreated, 0)
-	lastModified := lastModifiedTime.Format(time.RFC1123)
+	lastModified := metadata.Created.Format(time.RFC1123)
 	w.Header().Set("ETag", metadata.ETag)
 	w.Header().Set("Last-Modified", lastModified)
 	_, err := server.storage.CopyObjectToWriter(w, bucket, object)
@@ -205,7 +204,7 @@ func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata)
 	for _, object := range objects {
 		content := Content{
 			Key:          object.Key,
-			LastModified: formatDate(object.SecCreated),
+			LastModified: formatDate(object.Created),
 			ETag:         object.ETag,
 			Size:         object.Size,
 			StorageClass: "STANDARD",
@@ -222,7 +221,6 @@ func generateObjectsListResult(bucket string, objects []mstorage.ObjectMetadata)
 	return
 }
 
-func formatDate(sec int64) string {
-	timeStamp := time.Unix(sec, 0)
-	return timeStamp.Format("2006-01-02T15:04:05.000Z")
+func formatDate(t time.Time) string {
+	return t.Format("2006-01-02T15:04:05.000Z")
 }