Bug fixing on handling starve mode vs not