Next n+1 issue eliminated