Revert "Revert "marker-fix""

This reverts commit a687956ffdb5fd7ae702f38888680cf2624b6eef.
Revert "Revert "Revert "marker-fix"""

This reverts commit 30313c082a74fb978c0920a54d711e74cde58e5f.