Fixed double marker bug
Merged
balle