Fixed problems with Issues #1 and #2.