Fix multiple marker bug