Fix tag overflow, closes #32