Fix bug
WIP: Fix next marker bug