completed fix of block index in messages