Fix for cell range issue