Avatar save fixed at companie & worker controllers