fixObjects WIP 37