Fix to calculate_hand