fixObjects WIP 28