fixed tutorial macros