Bug #4 fixed