Issue #1789 - Pager bugs

Solves #1789 
I just did, seems to work fine. ;-)