Bug #140 fixed