buggfix & details