fixObjects WIP 7