fixed regression in last commit: ‘Block number out of range’