issue #9 fix attempt
issue #9 2nd attempt fix
issue #9 semi-fix