Fix potential blocks