Fix: potential stall

Signed-off-by: Gregory Detal <gregory.detal@uclouvain.be>