Issue #1789 - Pager bugs