Added Debug -  fix Bug 3