And fix this bracketing