fixObjects WIP 36