Fix/extraction