Bugfix and cosmetic fix