fix double jump
fix 409 conflict .. again.  this time it should really be fixed.