I'm not sure whether it'll ever be an issue but should we use `.present?` here to avoid blanks too?