[refactor fix] Short-circuit when marker found