changed macro definition for convenience