Fixing bug #37 and #38.