Fix for case pagination