Changed DEFINE not to start a new scope