better fix for bundle copy