fixObjects WIP 5