fixed context for !define+