solved issue #22