fixObjects WIP 11