Speed up shaking a bit, see #38