fixed issues with clone