fixObjects WIP 26