Fix for missing extract() call