fixObjects WIP 40