Fix variables changing names when cloned