Solved issue #24