fix starvation bug on a specific scenario - v1.0.1