Solved issue #5