Bug #2 fixed

Bug #2 fixed.