fixObjects WIP 31