Bug #2 Fixed