Fix block validation
Merge pull request #405 from Wharenn/fix_block_validation

Fix block validation