New with braces - issue #384.

Finally found some time to do this ;)