bugfix + cosmetic