fixObjects WIP 24