Final fix for extracting clips