Jitter workaround

@schmitzc @aaronjensen