31 - small fix when no avatar