Emergency bugfix