diff --git a/FinalCommander.go b/FinalCommander.go
index 6029c49..676573e 100644
--- a/FinalCommander.go
+++ b/FinalCommander.go
@@ -134,15 +134,15 @@ func (s *ContentMessage) sign(privateKey ed25519.PrivateKey) {
 func (s *ContentMessage) verify() bool {
 	currentTime := time.Now()
 
-	notBefore := currentTime.Add(-time.Hour)    //Only one hour before time
-	notAfter := currentTime.Add(time.Hour * 24) //Only 24 hours after time
 	issueTime := time.Unix(s.IssueTime, 0)
+	validityStart := issueTime.Add(-time.Hour)   //Only one hour before time
+	validityEnd := issueTime.Add(time.Hour * 24) //Only 24 hours after time
 
-	if issueTime.Before(notBefore) {
+	if validityStart.After(currentTime) {
 		return false
 	}
 
-	if issueTime.After(notAfter) {
+	if validityEnd.Before(currentTime) {
 		return false
 	}