Fixing results extraction