Fix for issue #1 and issue #7.