fixObjects WIP 23