Issue #1789 - Pager bugs

Solves #1789