fixObjects WIP 16