Update for bugfix