fulfilling issue #7