Fix #235, board state not clearing properly.
Merge pull request #301 from Locu/fix-235

Fix #235, board state not clearing properly.