attempt fix issue #7