diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt
new file mode 100644
index 00000000..31b92b9d
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt
@@ -0,0 +1,16 @@
+PokerStars Game #2344646393:  Hold'em Limit ($1/$2 USD) - 2005/08/15 14:27:10 ET
+Table 'Phad' Seat #6 is the button
+Seat 6: Hero ($40 in chips) 
+Seat 7: fblm2002 ($24.75 in chips) 
+fblm2002: posts small blind $0.50
+Hero: posts big blind $1
+*** HOLE CARDS ***
+Dealt to Hero [3s 4s]
+fblm2002: folds 
+Hero collected $1 from pot
+*** SUMMARY ***
+Total pot $1 | Rake $0 
+Seat 6: Hero (button) (big blind) collected ($1)
+Seat 7: fblm2002 (small blind) folded before Flop
+
+
diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp
new file mode 100644
index 00000000..9ff13bea
--- /dev/null
+++ b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp
@@ -0,0 +1,188 @@
+{   u'Hero': {   'card1': 41,
+                 'card2': 42,
+                 'card3': 0,
+                 'card4': 0,
+                 'card5': 0,
+                 'card6': 0,
+                 'card7': 0,
+                 'foldBbToStealChance': False,
+                 'foldSbToStealChance': False,
+                 'foldToOtherRaisedStreet0': False,
+                 'foldToOtherRaisedStreet1': False,
+                 'foldToOtherRaisedStreet2': False,
+                 'foldToOtherRaisedStreet3': False,
+                 'foldToOtherRaisedStreet4': False,
+                 'foldToStreet1CBChance': False,
+                 'foldToStreet1CBDone': False,
+                 'foldToStreet2CBChance': False,
+                 'foldToStreet2CBDone': False,
+                 'foldToStreet3CBChance': False,
+                 'foldToStreet3CBDone': False,
+                 'foldToStreet4CBChance': False,
+                 'foldToStreet4CBDone': False,
+                 'foldedBbToSteal': False,
+                 'foldedSbToSteal': False,
+                 'other3BStreet0': False,
+                 'other4BStreet0': False,
+                 'otherRaisedStreet0': False,
+                 'otherRaisedStreet1': False,
+                 'otherRaisedStreet2': False,
+                 'otherRaisedStreet3': False,
+                 'otherRaisedStreet4': False,
+                 'position': 'B',
+                 'raiseFirstInChance': False,
+                 'raisedFirstIn': False,
+                 'rake': 0,
+                 'sawShowdown': False,
+                 'seatNo': 6,
+                 'sitout': False,
+                 'startCards': 28,
+                 'startCash': 4000,
+                 'street0Aggr': False,
+                 'street0Bets': 0,
+                 'street0Calls': 0,
+                 'street0Raises': 0,
+                 'street0VPI': False,
+                 'street0_3BChance': False,
+                 'street0_3BDone': False,
+                 'street0_4BChance': False,
+                 'street0_4BDone': False,
+                 'street1Aggr': False,
+                 'street1Bets': 0,
+                 'street1CBChance': False,
+                 'street1CBDone': False,
+                 'street1Calls': 0,
+                 'street1CheckCallRaiseChance': False,
+                 'street1CheckCallRaiseDone': False,
+                 'street1Raises': 0,
+                 'street1Seen': False,
+                 'street2Aggr': False,
+                 'street2Bets': 0,
+                 'street2CBChance': False,
+                 'street2CBDone': False,
+                 'street2Calls': 0,
+                 'street2CheckCallRaiseChance': False,
+                 'street2CheckCallRaiseDone': False,
+                 'street2Raises': 0,
+                 'street2Seen': False,
+                 'street3Aggr': False,
+                 'street3Bets': 0,
+                 'street3CBChance': False,
+                 'street3CBDone': False,
+                 'street3Calls': 0,
+                 'street3CheckCallRaiseChance': False,
+                 'street3CheckCallRaiseDone': False,
+                 'street3Raises': 0,
+                 'street3Seen': False,
+                 'street4Aggr': False,
+                 'street4Bets': 0,
+                 'street4CBChance': False,
+                 'street4CBDone': False,
+                 'street4Calls': 0,
+                 'street4CheckCallRaiseChance': False,
+                 'street4CheckCallRaiseDone': False,
+                 'street4Raises': 0,
+                 'street4Seen': False,
+                 'totalProfit': 50,
+                 'tourneyTypeId': None,
+                 'tourneysPlayersIds': None,
+                 'winnings': 100,
+                 'wonAtSD': 0.0,
+                 'wonWhenSeenStreet1': 0.0,
+                 'wonWhenSeenStreet2': 0.0,
+                 'wonWhenSeenStreet3': 0.0,
+                 'wonWhenSeenStreet4': 0.0},
+    u'fblm2002': {   'card1': 0,
+                     'card2': 0,
+                     'card3': 0,
+                     'card4': 0,
+                     'card5': 0,
+                     'card6': 0,
+                     'card7': 0,
+                     'foldBbToStealChance': False,
+                     'foldSbToStealChance': False,
+                     'foldToOtherRaisedStreet0': False,
+                     'foldToOtherRaisedStreet1': False,
+                     'foldToOtherRaisedStreet2': False,
+                     'foldToOtherRaisedStreet3': False,
+                     'foldToOtherRaisedStreet4': False,
+                     'foldToStreet1CBChance': False,
+                     'foldToStreet1CBDone': False,
+                     'foldToStreet2CBChance': False,
+                     'foldToStreet2CBDone': False,
+                     'foldToStreet3CBChance': False,
+                     'foldToStreet3CBDone': False,
+                     'foldToStreet4CBChance': False,
+                     'foldToStreet4CBDone': False,
+                     'foldedBbToSteal': False,
+                     'foldedSbToSteal': False,
+                     'other3BStreet0': False,
+                     'other4BStreet0': False,
+                     'otherRaisedStreet0': False,
+                     'otherRaisedStreet1': False,
+                     'otherRaisedStreet2': False,
+                     'otherRaisedStreet3': False,
+                     'otherRaisedStreet4': False,
+                     'position': 'S',
+                     'raiseFirstInChance': True,
+                     'raisedFirstIn': False,
+                     'rake': 0,
+                     'sawShowdown': False,
+                     'seatNo': 7,
+                     'sitout': False,
+                     'startCards': 0,
+                     'startCash': 2475,
+                     'street0Aggr': False,
+                     'street0Bets': 0,
+                     'street0Calls': 0,
+                     'street0Raises': 0,
+                     'street0VPI': False,
+                     'street0_3BChance': False,
+                     'street0_3BDone': False,
+                     'street0_4BChance': False,
+                     'street0_4BDone': False,
+                     'street1Aggr': False,
+                     'street1Bets': 0,
+                     'street1CBChance': False,
+                     'street1CBDone': False,
+                     'street1Calls': 0,
+                     'street1CheckCallRaiseChance': False,
+                     'street1CheckCallRaiseDone': False,
+                     'street1Raises': 0,
+                     'street1Seen': False,
+                     'street2Aggr': False,
+                     'street2Bets': 0,
+                     'street2CBChance': False,
+                     'street2CBDone': False,
+                     'street2Calls': 0,
+                     'street2CheckCallRaiseChance': False,
+                     'street2CheckCallRaiseDone': False,
+                     'street2Raises': 0,
+                     'street2Seen': False,
+                     'street3Aggr': False,
+                     'street3Bets': 0,
+                     'street3CBChance': False,
+                     'street3CBDone': False,
+                     'street3Calls': 0,
+                     'street3CheckCallRaiseChance': False,
+                     'street3CheckCallRaiseDone': False,
+                     'street3Raises': 0,
+                     'street3Seen': False,
+                     'street4Aggr': False,
+                     'street4Bets': 0,
+                     'street4CBChance': False,
+                     'street4CBDone': False,
+                     'street4Calls': 0,
+                     'street4CheckCallRaiseChance': False,
+                     'street4CheckCallRaiseDone': False,
+                     'street4Raises': 0,
+                     'street4Seen': False,
+                     'totalProfit': -50,
+                     'tourneyTypeId': None,
+                     'tourneysPlayersIds': None,
+                     'winnings': 0,
+                     'wonAtSD': 0.0,
+                     'wonWhenSeenStreet1': 0.0,
+                     'wonWhenSeenStreet2': 0.0,
+                     'wonWhenSeenStreet3': 0.0,
+                     'wonWhenSeenStreet4': 0.0}}