Prevent lazy evaluation and fix add-mark-word function