Another attempt at fixing angle brackets