solved issue #17