solved issue #25