Object edit bugfix