Replace angle brackets for compatbility reason