Fix another offset bug and continue tags