Bug #20 fixed.