Whoops. Fix crash during tag creation