Bug #13 fixed