Fixed default avatar if avatar is null