markerPop and clustering conflicting

[JatGitHub]

I create a map, where when the user icon is clicked it can be moved to a different location.
All worked fine.
Click on user icon, select move to other location
Popup disappears
Click anywhere on the map
Click on popup, click on location is good and icon is indeed moved.

Now I have two icons, very close together. Something like 0.0005 apart.
This keeps them clustered, tried to set both Size & clusterMargin to 1
Clicking on the cluster shows them, clicking anywhere else directly make them cluster.

When clicking on the user icon, the popup appears,

Yet the popup stays, the icons appear double.

Clicking anywhere on the map, solves the issue.

Is there anyway to disable clustering all together and switching it on again?
Any help is appreciated, great product this is!