bugfix in macro definitions