Hopefully last fix for cloning