bugfix & change comment