fixObjects WIP 57