fix starvation, now should work 100%