issue #7 is fixed