Fix for #140

This should fix the issue for all blocks.