fix in avatar hiding and scrubbing