bugfix & cosmetic