Fix to ava avatar issue