Bug #22 fixed