fix n+1