Bug #6 fixed