Solved issue #174