Fix extraction