issue #24 fix