fixObjects WIP 0