Fixed #define madness