Add: issue #2 may be solved