issue #11 fix