fixObjects WIP 30