Fix mark logic