fixed: issue #8