issue #3 semi-fix