fixObjects WIP 18