Fix attr when $ collection contains text modules
Merge branch 'attr-text'