fixObjects WIP 12