Fix variable declaration block