Fix for optional extraction