fixed some clone errors