workaround for the first run problem, cosmetic changes