removed @empty from non-strings