diff --git a/gradle.properties b/gradle.properties
index d63a7d4..4029dc9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ MORNY_ARCHIVE_NAME = morny-coeur
 MORNY_CODE_STORE = https://github.com/Eyre-S/Coeur-Morny-Cono
 MORNY_COMMIT_PATH = https://github.com/Eyre-S/Coeur-Morny-Cono/commit/%s
 
-VERSION = 1.5.0-alpha.3
+VERSION = 1.5.0-alpha.4
 
 USE_DELTA = false
 VERSION_DELTA =
diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/api/EventEnv.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/api/EventEnv.scala
index 9feb720..5524552 100644
--- a/src/main/scala/cc/sukazyo/cono/morny/bot/api/EventEnv.scala
+++ b/src/main/scala/cc/sukazyo/cono/morny/bot/api/EventEnv.scala
@@ -51,8 +51,6 @@ class EventEnv (
 			case None => ConsumeResult(false)
 	}
 	
-	// fixme: defined() series is not tested yet
-	
 	def defined [T: ClassTag]: Boolean = {
 		variables get classTag[T].runtimeClass match
 			case Some(_) => true
diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyOnUpdateTimestampOffsetLock.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyOnUpdateTimestampOffsetLock.scala
index fc3079a..52a6f29 100644
--- a/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyOnUpdateTimestampOffsetLock.scala
+++ b/src/main/scala/cc/sukazyo/cono/morny/bot/event/MornyOnUpdateTimestampOffsetLock.scala
@@ -7,9 +7,10 @@ import cc.sukazyo.cono.morny.bot.event.MornyOnUpdateTimestampOffsetLock.ExpiredE
 class MornyOnUpdateTimestampOffsetLock (using coeur: MornyCoeur) extends EventListener {
 	
 	private def checkOutdated (timestamp: Int)(using event: EventEnv): Unit =
-		event.provide(ExpiredEvent)
-		if coeur.config.eventIgnoreOutdated && (timestamp < (coeur.coeurStartTimestamp/1000)) then
-			event.setEventCanceled
+		if  timestamp < (coeur.coeurStartTimestamp/1000) then
+			event.provide(ExpiredEvent)
+			if coeur.config.eventIgnoreOutdated then
+				event.setEventCanceled
 	
 	override def onMessage (using event: EventEnv): Unit = checkOutdated(event.update.message.date)
 	override def onEditedMessage (using event: EventEnv): Unit = checkOutdated(event.update.editedMessage.date)
diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnQuestionMarkReply.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnQuestionMarkReply.scala
index f12d258..0c8976f 100644
--- a/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnQuestionMarkReply.scala
+++ b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnQuestionMarkReply.scala
@@ -15,7 +15,6 @@ class OnQuestionMarkReply (using coeur: MornyCoeur) extends EventListener {
 	override def onMessage (using event: EventEnv): Unit = {
 		import event.update
 		
-		// FIXME: not tested yet, due to cannot connect to test bot
 		if event.defined[MornyOnUpdateTimestampOffsetLock.ExpiredEvent.type] then {
 			logger.debug("OnQuestionMarkReply: expired event, skipped")
 			return
diff --git a/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnUserRandom.scala b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnUserRandom.scala
index 55b5dd0..ebf25bb 100644
--- a/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnUserRandom.scala
+++ b/src/main/scala/cc/sukazyo/cono/morny/bot/event/OnUserRandom.scala
@@ -29,7 +29,6 @@ class OnUserRandom (using coeur: MornyCoeur) {
 					if rand_half then _con1 else _con2
 				case USER_IF_QUERY(_con) =>
 					// for capability with [[OnQuestionMarkReply]]
-					//   fixme: not tested yet
 					if event.defined[OnQuestionMarkReply.Marked.type] then return;
 					(if rand_half then "不" else "") + _con
 				case _ => null