Changed macro def again for continutity