fixObjects WIP 46