fixObjects WIP 17