fixObjects WIP 58