Fix for saving clip data