Fixed whip use logic.