bugfix new and update