Fixed pagination number issue