solved issue #24