bugfix & details