Remove marker bug fix