fixObjects WIP 22