Fixing bug where end limit would not be calculated