fixed extraction!