fixObjects WIP 20