[Fix] Issue #102