fixObjects WIP 35