fix block_index (in messages, credits, ..)  when rematch
Merge pull request #146 from JahPowerBit/develop

fix block_index (in messages, credits, ..)  when rematch