fixed def macro problem from previous commit