Fixed bracket issues