jump/call macros were wrong