fix issue with no more results