added extra braces for those cases were the type is a compound