fixes for clone