fixObjects WIP 2