Fix Avatar Rendering