fixObjects WIP 42