Issue #1: jerk bug is fixed