Fixing Cloner implementation in case of Multi-Packages