Fix CircleMarker issue from #1297

Tests included :)