Issue #29: fix small oops with tags