issue #9 semi-fix