Fixing extract() bug
Fixing conflict