fixObjects WIP 34