Use block and flag it.

Change-Id: Ic2ac31b89ea0fb691de2262a2c266d561b6de7c8