Hopefully fixed cloning.