Fixed problem with pagination and decorators