Add comment about special case
Simplify fetch size special case handling