Fixed double marker bug
Merged