Add extra condition for starvation