Guillaume's update to fix jitter