Please move this line up just after _tag is decoded. That will allow me to have a clean merge with the latest master.