Fix issues with brackets