solved issue #41