fixObjects WIP 61