fixObjects WIP 19