fixed brace ordering