fixObjects WIP 41