Fixed extraction bug