Tried to fix avatar bug