Fix for NilClass in Tag