Fix shallow to deeply cloning