issue #1 - fix