Fix videos save
merge fix