fixObjects WIP 1