fixObjects WIP 25