fix race condition; fixed regression due to name changes in block.js