bug fix with no pagination