Fixed issue with recursive copying