[shahid] fix extraction(fixes #14448)