Fixed empty blocks