Fixed Mathcal Macros