fixed marked so that substitutions are not wrapped in anything accidentally.