[FOLD] hops off by one fixes