Cosmetic fix in setup