fixObjects WIP 6