Fixed issue of having too much data to return