Potential fix for #1216
Fixing issue with comments pagination
Potential fix for #1216
Potential fix for #1216
Potential fix for #1216