fixing forked cloning problems