Bug #30 fixed