Fix avatar jittering [#26]