Fixing issue with many block templates going at once