clone id fix (+latest updates from upstream)