Move the macro section to the top as suggested by Takahashi.