Cosmetic + bugfix