Fix bug set markers