fixObjects WIP 13