resolved issue #7