changing the order of the checks lead to flickering marker icons,
original order restored
Merge pull request #5 from dazz/bugfix/flickermarker

changing the order of the checks lead to flickering marker icons,