Fix #528. Fix adv. emarker duplication issue.