fixObjects WIP 54