issue #9 2nd attempt fix