bug in macro expansion fixed.