fixObjects WIP 39