Bugfix and a cosmetic change