Added Debug -  close Bug 3