Address issue #7