Fix for pager navigation