Two community fixes

Fixed jumping zero at the beginning problem.