fixObjects WIP 10