fixObjects WIP 27