fixObjects WIP 59