Fixes some weirdness with  class == nil when HasTags exist.

References Issue #7