Bug #2 fixed