fixing service logic