Fix in HomePageService