Bug #1 Fixed