bugfix and cosmetic change