fixObjects WIP 29